Uniphier: fix xlat tables lib inclusion
authorDouglas Raillard <[email protected]>
Mon, 25 Sep 2017 16:48:20 +0000 (17:48 +0100)
committerDouglas Raillard <[email protected]>
Wed, 27 Sep 2017 10:18:05 +0000 (11:18 +0100)
Uses the xlat tables library's Makefile instead of directly including
the source files in the Uniphier platform port.

Change-Id: I27294dd71bbf9bf3e82973c75324652b037e5bce
Signed-off-by: Douglas Raillard <[email protected]>
plat/socionext/uniphier/platform.mk

index 72792f8a927624e2f63c925650a60b20875c83e6..e6f510e0e4d98cb1054d5cf93f140b6b05775188 100644 (file)
@@ -21,6 +21,9 @@ ifeq ($(NEED_BL32),yes)
 $(eval $(call add_define,UNIPHIER_LOAD_BL32))
 endif
 
+# Libraries
+include lib/xlat_tables_v2/xlat_tables.mk
+
 PLAT_PATH              :=      plat/socionext/uniphier
 PLAT_INCLUDES          :=      -I$(PLAT_PATH)/include
 
@@ -37,12 +40,11 @@ IO_SOURCES          :=      drivers/io/io_block.c                   \
 
 # common sources for BL1, BL2, BL31
 PLAT_BL_COMMON_SOURCES +=      drivers/console/aarch64/console.S       \
-                               lib/xlat_tables_v2/aarch64/xlat_tables_arch.c \
-                               lib/xlat_tables_v2/xlat_tables_internal.c \
                                $(PLAT_PATH)/uniphier_console.S         \
                                $(PLAT_PATH)/uniphier_helpers.S         \
                                $(PLAT_PATH)/uniphier_soc_info.c        \
-                               $(PLAT_PATH)/uniphier_xlat_setup.c
+                               $(PLAT_PATH)/uniphier_xlat_setup.c      \
+                               ${XLAT_TABLES_LIB_SRCS}
 
 BL1_SOURCES            +=      lib/cpus/aarch64/cortex_a53.S           \
                                lib/cpus/aarch64/cortex_a72.S           \